Skip to content

CLDSRV-635: Fix ubuntu 20 in CI#5787

Merged
bert-e merged 1 commit intodevelopment/7.10from
improvement/CLDSRV-635-fix-ci-ubuntu
Apr 8, 2025
Merged

CLDSRV-635: Fix ubuntu 20 in CI#5787
bert-e merged 1 commit intodevelopment/7.10from
improvement/CLDSRV-635-fix-ci-ubuntu

Conversation

@BourgoisMickael
Copy link
Copy Markdown
Contributor

@BourgoisMickael BourgoisMickael commented Apr 8, 2025

This is a scheduled Ubuntu 20.04 brownout. Ubuntu 20.04 LTS runner will be removed on 2025-04-15. For more details, see actions/runner-images#11101

@BourgoisMickael
CLDSRV-635: Fix ubuntu 20 in CI
5c4a1b3 
> This is a scheduled Ubuntu 20.04 brownout. Ubuntu 20.04 LTS runner will be removed on 2025-04-15. For more details, see actions/runner-images#11101
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Apr 8, 2025

Hello bourgoismickael,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval ⭐
/bypass_build_status Bypass the build and test status ⭐
/bypass_commit_size Bypass the check on the size of the changeset TBA ⭐
/bypass_incompatible_branch Bypass the check on the source branch prefix ⭐
/bypass_jira_check Bypass the Jira issue check ⭐
/bypass_peer_approval Bypass the pull request peers' approval ⭐
/bypass_leader_approval Bypass the pull request leaders' approval ⭐
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@scality scality deleted a comment from bert-e Apr 8, 2025
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Apr 8, 2025

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

BourgoisMickael commented Apr 8, 2025

/create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Apr 8, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/8.8/improvement/CLDSRV-635-fix-ci-ubuntu with contents from w/7.70/improvement/CLDSRV-635-fix-ci-ubuntu
and development/8.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.8/improvement/CLDSRV-635-fix-ci-ubuntu origin/development/8.8
 $ git merge origin/w/7.70/improvement/CLDSRV-635-fix-ci-ubuntu
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.8/improvement/CLDSRV-635-fix-ci-ubuntu

The following options are set: create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Apr 8, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/9.0/improvement/CLDSRV-635-fix-ci-ubuntu with contents from w/8.8/improvement/CLDSRV-635-fix-ci-ubuntu
and development/9.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/9.0/improvement/CLDSRV-635-fix-ci-ubuntu origin/development/9.0
 $ git merge origin/w/8.8/improvement/CLDSRV-635-fix-ci-ubuntu
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/9.0/improvement/CLDSRV-635-fix-ci-ubuntu

The following options are set: create_integration_branches

@nicolas2bert
Copy link
Copy Markdown
Contributor

nicolas2bert commented Apr 8, 2025

Have you seen any other repo impacted?

@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

BourgoisMickael commented Apr 8, 2025 •
edited
Loading

Have you seen any other repo impacted?

yep we have 32 repo https://scality.slack.com/archives/CFDJAPQ6S/p1744119283856149

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Apr 8, 2025

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Apr 8, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

The following options are set: create_integration_branches

@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

BourgoisMickael commented Apr 8, 2025

/approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Apr 8, 2025

Build failed

The build for commit did not succeed in branch w/9.0/improvement/CLDSRV-635-fix-ci-ubuntu

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Apr 8, 2025

Build failed

The build for commit did not succeed in branch w/9.1/improvement/CLDSRV-635-fix-ci-ubuntu

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Apr 8, 2025

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.8

  • ✔️ development/9.0

  • ✔️ development/9.1

The following branches have NOT changed:

  • development/7.4

Please check the status of the associated issue CLDSRV-635.

Goodbye bourgoismickael.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit 5c4a1b3 into development/7.10 Apr 8, 2025
10 checks passed
@bert-e bert-e deleted the improvement/CLDSRV-635-fix-ci-ubuntu branch April 8, 2025 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@anurag4DSB anurag4DSB anurag4DSB approved these changes

@nicolas2bert nicolas2bert nicolas2bert approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@BourgoisMickael @bert-e @nicolas2bert @anurag4DSB